Updates for Ubigraph

Analogous fixes for Ubigraph. Sorry, missed this one as I can't compile
w/ Ubigraph.