Minor fixes after merge of disconnected graph stuff