Minor changes for the ABP.