Added fixes for /hc help