More fixes & work on HFA