Fixes for App Store submissions