Clean up package metadata a bit