4D unmasking fixes