Fixed output path issues.

Upgraded submodules.