Add packages. Some fixes.