Fixes in calendar