[PATCH] Calendar fixes