Minor fixes
After merge of first change