Upped submodules with minor fixes.