More fixes
19 files changed