Fix a few packaging bugs