Bug fixes to Touchstone