fixes for several jira issues

WOBS-3097
WOBS-3067
WOBS-3060