Fixing for ARC and stuff.