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 ) {
age-management.scm?id=ebd1ba713cbefc9ad5dac609255e1344a328e360'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/package-management.scm'>
<input type='hidden' name='id' value='ebd1ba713cbefc9ad5dac609255e1344a328e360'/><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=ebd1ba713cbefc9ad5dac609255e1344a328e360'>root</a>/<a href='/guix/log/gnu?id=ebd1ba713cbefc9ad5dac609255e1344a328e360'>gnu</a>/<a href='/guix/log/gnu/tests?id=ebd1ba713cbefc9ad5dac609255e1344a328e360'>tests</a>/<a href='/guix/log/gnu/tests/package-management.scm?id=ebd1ba713cbefc9ad5dac609255e1344a328e360'>package-management.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/tests/package-management.scm?id=ebd1ba713cbefc9ad5dac609255e1344a328e360&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-22 22:10:11 +0300'>2020-07-22</span></td><td><a href='/guix/commit/gnu/tests/package-management.scm?id=4656180d5de1fef2846bea9af27ae509f32376ba'>services: nix: Fix sandbox.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/package-management.scm: New file.
* gnu/local.mk: Add this.
* gnu/services/nix.scm (&lt;nix-configuration&gt;): New record.
(nix-activation): Generate Nix config file which fixes sandbox.
(nix-service-type): Add default value.
(nix-shepherd-service): Allow provide Nix package.
* doc/guix.texi (Miscellaneous Services)[Nix service]&lt;nix-configuration&gt;:
Document record.
</span></span></td><td>Oleg Pykhalov</td></tr>