diff --git a/COPASI.spec b/COPASI.spec
index 26b89ac..7f087f6 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -75,8 +75,6 @@ BuildRequires: libxslt-devel
 BuildRequires: pkgconf-pkg-config
 BuildRequires: %{blaslib}-devel
 BuildRequires: crossguid2-devel >= 0:0.2.2
-# Needed until https://bugzilla.redhat.com/show_bug.cgi?id=1721342 is resolved
-BuildRequires: libuuid-devel
 BuildRequires: desktop-file-utils
 BuildRequires: swig
 BuildRequires: expat-devel
@@ -294,14 +292,14 @@ sed -i.bak '/C_FLOAT64 d_lg10(C_FLOAT64 *);/d' copasi/optimization/CPraxis.cpp
 
 %build
 %if 0%{?fedora} < 33
-mkdir -p build && pushd build
+mkdir -p build
 # This directory is outside of build dir
-ln -s ../copasi copasi
+ln -s ../copasi build/copasi
 %endif
 export CXXFLAGS="-I$PWD/copasi/lapack -I$PWD/copasi/CopasiSBW -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
 export LDFLAGS="%{__global_ldflags} -lbz2"
 %cmake -B build \
- -DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
+ -Wno-dev -DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
 %if 0%{?with_python}
  -DENABLE_PYTHON:BOOL=ON \
  -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
@@ -362,7 +360,7 @@ export LDFLAGS="%{__global_ldflags} -lbz2"
  -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \
  -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
  -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \
- -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES -Wno-dev ..
+ -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES .
 
 %make_build -C build