Minor fixes. Dependency resolving not done