Fixing the last few bugs with dependencies