More fixes
3 files changed