Fixing up reskinning issues with the RangeMaster Uniform