Fixed errors in calendar