Fix compilation errors in last commit