Last dev fixes (this one was done in a hurry to master, blah!).