SPLEVO-391 small bug-fixes