Fixed setup mistakes