-minor fixes