Corrected a few errors found during idle test.