general: merge fixes

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>