Fix flash messages and return gon.returned_train