Fixing broken status references