Leftovers fix
(see previous commit for details)