bugfixes for arm