Bug fixes
Merge fix