Fix warnings with submodule changes