More fixes for --release-build.