MT#5879 Few small fixes of some some already fixed errors.

Some small fixes which should make behavior much more clear.
I already did some of them them today, but seems like lost somwhow.