Fixing bugs after merging