Fixes and additions to dependency