[en] Various small fixes