minor fixes after that reorganisation