fixed compiler errors.  Preparing for merge