Fix a bad merge in Geometry (affects screenAlignedQuad)
Fix some clang compiler errors