Minor fixes found while working on packaging