Fix last few calendar issues