Small GDC fixes