Fix some errors
Update lists
Add pkgwat.api to dependencies