fix more bugs
2 files changed