Complex fixups

Merged Philipp Arras requested to merge complex_fixups into NIFTy_6

Merge request reports