The last change fixed the warnings, but broke the build. This reintroduces some warnings, but fixes the build again.