Headroom class fixes for updated conventions