Xcode beta 3 fixes (mostly for CGFloat Float to Double change)