Optimized masking and fake corrections