Various changes for app store submission