More fixes to things I think