minor fixes to setup