Updated some dependency resolution issues