Small clean-up
See changelog