Packages loading cleanup + bugfixes