several small fixes to the new get/put standalone tools