Enhance rights management / fix