FastICA improvements

Fixes #2101.