fixed compilation errors from previous commits