Dependencies scope fix, erasure fix