minor fixes on last commit