More fixes to prevent hp xp