Fix package definitions