a few more fixes
2 files changed