Fixed setup issues
Fixed setup issues