Fixed compilation problems that crept into the code.