minor fixes on setup