Cleaning up more issues found with check scripts.