More distribution fixes.

Change-Id: Ia4f0ae1384c25d91f633a9248cf356935fb4c325