Reviewed fixes
Resolved conflicts