checked in bugfixes for ARM