diff --git a/.gitignore b/.gitignore
index 9ba242e9..979a2930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ _build*
 **/.vscode/**
 **.egg-info
 *.pdf
-*/logs/*
+*tests/logs/*
 
 # waf build files
 .lock-waf_*
diff --git a/lib_xua/api/xua_buffer.h b/lib_xua/api/xua_buffer.h
index 75a90545..f7e4c88d 100644
--- a/lib_xua/api/xua_buffer.h
+++ b/lib_xua/api/xua_buffer.h
@@ -1,4 +1,4 @@
-// Copyright 2011-2021 XMOS LIMITED.
+// Copyright 2011-2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef __XUA_BUFFER_H__
 #define __XUA_BUFFER_H__
diff --git a/lib_xua/src/core/endpoint0/chanstrings.h b/lib_xua/src/core/endpoint0/chanstrings.h
index f1e98422..b30886a5 100644
--- a/lib_xua/src/core/endpoint0/chanstrings.h
+++ b/lib_xua/src/core/endpoint0/chanstrings.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 XMOS LIMITED.
+// Copyright 2015-2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 /* AUTOGENERATED using chanstringgen.py */
 
diff --git a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
index 53772974..0faff730 100644
--- a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
+++ b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
@@ -10,12 +10,13 @@
 #define _DEVICE_DESCRIPTORS_
 
 #include <stddef.h>
-#include "xua.h"             /* Device specific define */
+#include "xua.h"                       /* Device specific define */
 #include "descriptor_defs.h"
 #include "usbaudio20.h"                /* Defines from the USB Audio 2.0 Specifications */
 #include "usbaudiocommon.h"
 #include "xud_device.h"
 #include "xua_hid_descriptor.h"
+#include "xud.h"
 
 #define APPEND_VENDOR_STR(x) VENDOR_STR" "#x
 
@@ -2682,7 +2683,7 @@ unsigned char cfgDesc_Audio1[] =
 #elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)
     ISO_EP_ATTRIBUTES_SYNC,               /* Iso, sync, data endpoint */
 #else
-#error "Bad XUD_SYNCMODE"
+#error "Unsupported XUA_SYNCMODE"
 #endif
     (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff),      /* 4  wMaxPacketSize (Typically 294 bytes)*/
     (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5  wMaxPacketSize */
@@ -2830,7 +2831,7 @@ unsigned char cfgDesc_Audio1[] =
 #elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)
     ISO_EP_ATTRIBUTES_SYNC,               /* Iso, sync, data endpoint */
 #else
-#error "Bad XUD_SYNCMODE"
+#error "Unsupported XUA_SYNCMODE"
 #endif
     FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff,        /* 4  wMaxPacketSize (Typically 294 bytes)*/
     (FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5  wMaxPacketSize */
diff --git a/tests/test_i2s_loopback/main.xc b/tests/test_i2s_loopback/main.xc
index 73a24db1..a98bc9ec 100644
--- a/tests/test_i2s_loopback/main.xc
+++ b/tests/test_i2s_loopback/main.xc
@@ -203,7 +203,7 @@ void slave_mode_clk_setup(const unsigned samFreq, const unsigned chans_per_frame
 
 #endif
 
-#if XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM
+#if (XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM)
 const int i2s_tdm_mode = 8;
 #else
 const int i2s_tdm_mode = 2;