Even more hAce improvments