Bring some addjustments from master