Bug fixes

Fixes for issues XFITTER-87, XFITTER-89 and XFITTER-92 (thanks to @ozenaiev for reporting them)

For more information, see messages on individual commits.