GDC compliation fixes