build fixes and submodule changes