Misc reliability cleanups.

The first touch always works now, and flicker is reduced.