Fixes to get it compile.