Fixed calendar related issues.