Simple fixes for latest Touch v3 build