Fixes for packaging.