Minor bug fixes
Corrected merge conflct