Even even even more minor fixes