Fix a couple of strange issues.