Misc changes, see commit log