Tweaks to how status updates are handled in prepartion for UI changes.