Fixed moon issues