Fixes according to BEMINFO-445