1.6 fixes. Last commit before switching to develop branch