Fixes for OS X bundle