Fix compilation errors...