More fixes for DHooks related stuffs