Import fixes and submodule update for lang