Some more fixes and display HUD improvements