Calendar small fixes