changes to get the stuff to compile with iOS 6 without any warnings