Fix up packaging ready for beta release