ffwizard-berlin: fix refactoring errors