Some cleanup and fixup of samples.