Misc updates and packaging bug fix