Some bugs fixed

ARMv7 partially restored