More fixes for weird commits