More fixes for Aquilon 1.11.9