Bug Fixes (cocoa imp)