Compatability fixes for armv7