Minor fixes to new analyze controller.