Touch fixes for my implementations