Various tweaks to the patent sample data loader