Minor fixes and another try to fix the release