Fixed compilation problems lingering from the merge.