More fixes, more to come