Adding tweaks to help distribution. No functional changes.