Bug fixes
Conflicts resolved