Fix a few minor compilation problems.