Minor fixes
merge issues