Report errors. Minor cleanup.