Fix for main dependencies