fixes for packaging