Bugfixes for ARM CPU