Making changes to improve likelihood AORRA will compile.