Calendar generation fixes.