Fixes to tapatalk issues