Fix a couple of smaller issues.