More fixes

Yeah, I suck @ C