Fixed R17.0 compiler errors