Small up-date to test so they work with the data scripts in the samples.

Not sure why I have the two other PR's in there. Looks like they are merged with the main fork anyway so shouldn't make a difference.