State and HUD fix