More fixes for the ARM work I've been doing...