More fixes, hopefully