Fixed some issued on Datahub stuff