Minor fixes
merge