Fixes for packaging