Fixes from master/bef for staging.