Add -DHOSTED
Fixed bugs in dump