Data Use Restriction Fixes

Fixes #62 and #63