Fixes for building on ARM... (which is working great, BTW...)