More fixes to this thing