fixed a couple CR issues.