Some armv6 fixes

Change-Id: Ied2a9b9235baf6867d668f7758f8c7ab5465ccee