Apply changes for ARC-compatibility

Signed-off-by: Greg Hurrell <greg@hurrell.net>