Add dependence
Fix some warning