Got the loading icon back on track and improved the handling of inline operations.