FL-1295: multiple fixes for multilib, as well as GNOME.