fix map and tablet problems