Misc cleanup to prepare for submission to the App Store.