-- minor fixes