Bugfixes for tablet format