More fixes and things