Fixed runtime errors from the V3 update