diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml
index e3a4db4..fc9d922 100644
--- a/.github/workflows/cmake-ci.yml
+++ b/.github/workflows/cmake-ci.yml
@@ -17,14 +17,15 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        #os: [ubuntu-latest, macos-latest]
+        os: [macos-latest]
         build_type: [Release, Debug]
         skip_meson: [false]
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             build_type: Release
             skip_meson: true
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             build_type: Debug
             skip_meson: true
 
diff --git a/src/codeccontext.h b/src/codeccontext.h
index 564123d..4036fb0 100644
--- a/src/codeccontext.h
+++ b/src/codeccontext.h
@@ -322,7 +322,7 @@ class VideoCodecContext : public CodecContextBase<Clazz, _direction, AVMEDIA_TYP
 
     void setWidth(int w) // Note, it also sets coded_width
     {
-        if (isValid() & !isOpened())
+        if (isValid() && !isOpened())
         {
             m_raw->width       = w;
             m_raw->coded_width = w;
diff --git a/src/frame.cpp b/src/frame.cpp
index 2043226..3f06c6d 100644
--- a/src/frame.cpp
+++ b/src/frame.cpp
@@ -90,11 +90,6 @@ void avcpp_null_deleter(void* /*opaque*/, uint8_t */*data*/)
 namespace av
 {
 
-VideoFrame::VideoFrame()
-{
-
-}
-
 VideoFrame::VideoFrame(PixelFormat pixelFormat, int width, int height, int align)
 {
     m_raw->format = pixelFormat;
diff --git a/src/frame.h b/src/frame.h
index 5620203..1093122 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -4,6 +4,10 @@
 #include <memory>
 #include <stdexcept>
 
+#if __has_include(<span>)
+#include <span>
+#endif
+
 #include "ffmpeg.h"
 #include "rational.h"
 #include "timestamp.h"