Fixed some HEADer bugs