Upgrade submodules and adjust patch