More reminder bugfixes