More fixes
14 files changed