Fixes for v2 touch support & minified