updates to compile with Xcode gm release