Some fixes after the package seperation