#12 Fix small things related to reminder.