Changes from -rc diff review