bugfixes for tablet + graph