fixes to make work with tablets