Fixing small bugs and code conflicts.