Merge "Fix up status page dependencies"