minor compilation errors from previous two changes