Bugfix broken packages

### CHANGE SUMMARY

* Packages were still broken probably due to the previous merge being ignored. 

This will fix it.