Cleanup and fixes dependency typo