Small fixes.
Fixed dependencies.