Final fix to dependencies