Small toast-ajax fixes....
Merge branch 'toast-ajax'