update from master: More touch fixes