Updated submodules; small fixes.