Fixes after wrong commit in rev. 48776