Futher fixes to make things work with the new compiler.