Fix up different package issues

Fixup a few things.
new stuff