fixes according to BEMINFO-620 issue