Bug fixes
merge