A few minor updates for bug fixes.
Resolved conflicts.