Add some fixes for the backup date calendar bit - re: #356