Fix a few setup issues