Touch fixes