Fixing compiling errors after previous pull request