Template fixes for iOS and Windows