Touch small fixes