Moonshine upgrade corrections