bug fixes
Merge