master minor fixes