Added warnings; compiles and tests are green.