Fix, fork and update submodules