few fixes in calendar