Fixes, changes
3 files changed