Minor calendar fixes