Fix all obvious bugs !