Submodule updates and fixes