Fix warnings, tests failures.