A few more fixes (spamming the commit log again...)