more tweaks for iOS6 and init method consistency