Bug fixes
merge fixes
bug fixes