Further fixes to status refactor