fix setup issues