Correcting internal dependancies