more minor fixes for setup