8.0 calendar fixes jke