Minor fixes I came across when testing modulegraph a bit