Various updates to submodules