Updated submodules with latest sources
Bring in some string tweaks