Misc. fixes

That's the remaining diff between my and your repo :)