Major PKG Bugfixes