Minor calendar improve