#1 fixes in calendar