minor fixes
merge
fixtures