minor fixes to setup tasks