Corrected Compile Errors from Refactoring.  TEST.