Minor updates to CFA management