Update submodules and fix method interfaces