Improvements to CLI and Census.