fix minor bugs in setup