PUT and other fixes