Update and fix setup