Fix packages to build

This is a work in progress, as I am building my stack. Just to let people know that these are being fixed.
Once I finish, I'll merge it.