master_sync fixes from review.