Added OSX-Carbon fixes