fixes for setup