Fix rights and type