Definition fixes.