Fix some issues with the click packaging