Better conformance to Apple beta software guidelines