Attempt to fix some compilation problems.