More minor fiddling