Small fixes
merge