bugfixes for mobile