Fixed code that did not compile by auto build system.  Part 2.