Corrected dependency issues