Small fix in hud and state manager
Merge remote-tracking branch 'origin/master' into Small-fix