Fixing submodule drama?