Fix warnings and debug logs that were lagging us.