calendar fixes