Small fixes and enable for touch