More fixes and the like