Two bugs in analysis code.