Degenerate fixes for fill state changes