More fixes and such