Rights fixes