Touch devices fixes