[[ LC 6.7 GM1 ]] Tweaks to get rid of compile errors for ios 5.0 simulator/device