Updated submodules. Fixed path references broken by commit 362c3e2