Fixes for the packaging