Attempting to address CI build errors