Calendar fixes - 1