Fixing and updating deps