Some fixes after 1dfd619f070