Fixes for touch shield