small fixes for distribution

Change-Id: If7d9bde27dac786476cb72e0996cf634ea6a830f