A bit of cleanup
More fixes