Merge of small changes