Various fixes and flash messages.