Fixed setup issues