Bug fixes
merged