fixed build errors gr36