Update submodules and bug fixes