fixed up some more dependency issues