Fix previous pull request compilation errors