Minor fixes regarding packaging.