Turning on more warnings, trying to keep the code nice and clean.
Fix for unit test failure