GF33087 fixed some build issues