Minor changes to system utility classes to improve initial state of the
system, particularly during unit testing.