Re-add missing packages.
Misc. small fixes after recent refactoring.