erorcun fixes to last HUD commits