Hopefully this wil fix build errors in the submodule