More compile errors fixed