Touch-punch fixes