Changes to migrate to 32 bit arch (armv7l)