Crm 13973 qa : fixes for points mentioned in #comment-58325