Bug/minor fixes packaging