Multiples code fixes.