Fixes for ACT6 1.5 spotted by MJS