COMP: Fixed broken stuff such that project actually compiles

Various broken-ness mended.