'Fix' renamed to 'While' better reflecting its actual behavior.

Some resource warnings fixed.