Fixed issues with calendar.
Fixed other minor warnings.