Fixing more issues with release