More fixes for HeadsUp