minor fixes after merger