fixes for armv7