[HOTFIX] Fix compilation errors in branch-1.1

This was introduced in 2ffc7980c6818eec05e32141c52e335bc71daed9.