Fix some setup issues