fix compilation errors in my previous patch