Few more fixes for HFA