More fixes for tablet logic.