FL-715: FL-719: more hardened tweaks by vroman