Fixes
Waiting spinner and error notices