Fixes to 3D shuffler to fix #1463.