Fix few specs & fix flash messages