Fixes to work with the new compiler.