fixes to dependency issues