Some tweaks to the python data loader