Fixing compilation issues caused by last commit (ref commit
32d62bb062cc52e20a6f6db09d7f33afc20a3735)