Some little tweaks so it compiles now.