Fixes several samples.

There may be issues with cropping, but so far, I have not found any
in my samples set.

Patch attached.