Small addons for better user experience on success/failure