Another try at making Xcode happy