A few remaining calendar tweaks