Some fixes in calendar