Updated and fixed submodule references