Fixed some unix merge patches