Minor fixes, prep for reminders