small but necessary fixes

(merging your branch in my own somehow messed up my history, this is a very small fix so you might want to squash-merge to yours)