fixes for MODULES-1255, MODULES-1253, MODULES-1252, MODULES-1250

fixes for MODULES-1255, MODULES-1253, MODULES-1252, MODULES-1250