[src] Fixing dependency issues