All of the other bugfixes in one commit.