Make Release build work