various calendar fixes