Tablet rendering fixes