[[ LC 6.7.1 rc2 ]] Tweaks to make things compile on iOS 5.0