Changes to fix setup