Corrected compilation errors (again)