More fixes due to wrong merge