Fixing compiling problems associated with last refactoring.  (Oops! :-P)