Dependency issues fixes.