maj, minor fixes