Minor fixes that I have to commit before merging the latest from testing.