More fixes and stuff