Fix Non resolvable dependencies