Merge "Small accept4 fixes."