Fixing Calendar bugs and Leslie bugs