Fix compilation errors 1/2