RF: More fixes.
RF: More fixes.

JohnGriffiths/dipy,demianw/dipy,beni55/dipy,sinkpoint/dipy,villalonreina/dipy,matthieudumont/dipy,oesteban/dipy,Messaoud-Boudjada/dipy,rfdougherty/dipy,nilgoyyou/dipy,demianw/dipy,sinkpoint/dipy,StongeEtienne/dipy,jyeatman/dipy,jyeatman/dipy,samuelstjean/dipy,rfdougherty/dipy,samuelstjean/dipy,mdesco/dipy,StongeEtienne/dipy,FrancoisRheaultUS/dipy,samuelstjean/dipy,oesteban/dipy,Messaoud-Boudjada/dipy,FrancoisRheaultUS/dipy,nilgoyyou/dipy,mdesco/dipy,villalonreina/dipy,beni55/dipy,JohnGriffiths/dipy,matthieudumont/dipy