Fix a couple more issues.