Master fix tiff conversion

This will be an interesting test of merging vs rebasing against latest master