Minor updates to AFFNManager.