I've also had the case where I was waitlisted for NF on a 2-class, and when the plane switch to 3-class I didn't clear to the available NC space. The agent had to remove my upgrade request and reenter it as an NC request. Then the plane went back to 2-class, and it's still listed as an NC upgrade.