Resolve some issues with proper reporting of active and complete