Fixes for CUA: .tiff and merge fix