Some fixes for HU FW