Fixed setup some more