Several fixes for tablet