Fix some bugs
Depend on correct package