Fix component mask range errors