diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp
index c8a253fc901..bd35f82d185 100644
--- a/intern/itasc/kdl/tree.hpp
+++ b/intern/itasc/kdl/tree.hpp
@@ -34,7 +34,7 @@ namespace KDL
     //Forward declaration
     class TreeElement;
     // Eigen allocator is needed for alignment of Eigen data types
-    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
+    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
 
     class TreeElement
     {
diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h
index 6e669701f3b..977976c3fc0 100644
--- a/intern/cycles/util/util_sseb.h
+++ b/intern/cycles/util/util_sseb.h
@@ -22,6 +22,9 @@ CCL_NAMESPACE_BEGIN
 
 #ifdef __KERNEL_SSE2__
 
+struct ssei;
+struct ssef;
+
 /*! 4-wide SSE bool type. */
 struct sseb
 {
@@ -116,7 +119,7 @@ __forceinline const sseb unpacklo( const sseb& a, const sseb& b ) { return _mm_u
 __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
 
 template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
-	return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
+	return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
 }
 
 template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
f0b3bf0d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/docker.scm'>
<input type='hidden' name='id' value='70f9ae23b1c5db4497401b207046c11af0b3bf0d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=70f9ae23b1c5db4497401b207046c11af0b3bf0d'>root</a>/<a href='/guix/log/gnu?id=70f9ae23b1c5db4497401b207046c11af0b3bf0d'>gnu</a>/<a href='/guix/log/gnu/services?id=70f9ae23b1c5db4497401b207046c11af0b3bf0d'>services</a>/<a href='/guix/log/gnu/services/docker.scm?id=70f9ae23b1c5db4497401b207046c11af0b3bf0d'>docker.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/docker.scm?id=70f9ae23b1c5db4497401b207046c11af0b3bf0d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-04 11:54:50 +0300'>2024-08-04</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=26638b8e8129aa755586d017677b4cf076bafda6'>services: containerd: Provision separately from docker service.</a><span class='msg-avail'>...</span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2024-07-05 15:12:34 +0800'>2024-07-05</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=5ee2799cabba4b2d462ac064a98789d7bca07923'>services: oci-container: Allow setting Shepherd actions in oci-container-conf...</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi via Guix-patches via</td></tr>
<tr><td><span title='2024-07-05 15:12:34 +0800'>2024-07-05</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=cb57a3fd9f09f4158f1e2ff122ac855be422f374'>services: oci-container: Allow setting Shepherd respawn? in oci-container-con...</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi via Guix-patches via</td></tr>
<tr><td><span title='2024-07-05 15:12:34 +0800'>2024-07-05</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=7d91bd453010da8941f32694706024645905ae37'>services: oci-container: Allow setting Shepherd auto-start? in oci-container-...</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi via Guix-patches via</td></tr>
<tr><td><span title='2024-07-05 15:12:34 +0800'>2024-07-05</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=30ba86cb712e1012708d2bafad21d6b7266f0c6f'>services: oci-container: Allow setting Shepherd log-file in oci-container-con...</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi via Guix-patches via</td></tr>
<tr><td><span title='2024-06-06 13:55:20 +0800'>2024-06-06</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=2b2337f275a6421a0d0964c54987df4ac74162e6'>services: oci-container: Fix provided image is string.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-05-25 15:34:53 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=c07731a777137b673725a4318411a3df6e221d29'>gnu: docker: Allow passing tarballs for images in oci-container-configuration.</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-05-25 15:34:47 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=68adfaea25a31247c1555f503839f928ba2e9a04'>gnu: docker: Allow setting Shepherd dependencies in oci-container-configuration.</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-05-25 15:34:43 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=e68c1af4f4cb2223b37c7bdcc925ca6ad551da24'>gnu: docker: Allow setting host environment variables in oci-container-config...</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-05-25 15:34:38 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=003c89a85ced239e2dac4f89cc52117e188e2810'>gnu: docker: Provide escape hatch in oci-container-configuration.</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-01-03 15:32:01 +0100'>2024-01-03</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=2f642b602398ab32b18faceecd074f49da92e95e'>services: docker: Add config-file option.</a><span class='msg-avail'>...</span></td><td>Connor Clark</td></tr>
<tr><td><span title='2023-12-10 22:23:29 +0100'>2023-12-10</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=be3b7f446787033db9405d0d0b821b73f462ed3a'>services: Fix oci-container-service-type container user.</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2023-11-23 12:56:42 +0100'>2023-11-23</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=267786721b64c11343d9f96fde21d79a07655bf3'>services: Add oci-container-service-type.</a><span class='msg-avail'>...</span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2023-08-08 18:01:55 +0200'>2023-08-08</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=969cea683615e79c7e6548f945f15af80ad58a8a'>file-systems: Use cgroups v2.</a><span class='msg-avail'>...</span></td><td>Sam Lockart</td></tr>
<tr><td><span title='2022-07-13 21:36:41 -0400'>2022-07-13</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=b33e1a183f6756514e6b6a3b84054a232dbddad4'>services: docker: Fix race condition.</a><span class='msg-avail'>...</span></td><td>Oleg Pykhalov</td></tr>