BZ-12041 fixing issues