Fixes to initial implementation package_data