MINOR fixes