Package upgrade + bugfixe