Fix of unit declarations.