Small changes and submodule update.