Updated to latest Xcode and fixed disabled state