Fix compilation errors caused by last commit