Some changes for xcode