Fixing warnings and cascading test failures