Path fixes
Update submodules