..and the warnings created by fixing fixed as well...