SDL2 -> Cocoa fixes Part 2