Bug fixes
Another merge