a few fixes after the refactoring of packages