Tweak some stuff to make the sample easier