Fix some warning for distribution
2.1.15