Fewer error messages and other tiny changes.