More fixes
8 files changed