A few fixes on altar gen.