further minor fixes