Bug fixes for touch devices