Janitorial fixes for packaging