Altar generation fixes