Fix build
Update submodules