Bugfixes for tablets