Fix dependencies in 0.6
Merge