Attempt to fix 5.1 compilation
Maybe fix 5.1.1 building