ACG and other fixes