More fixes for dependencies, and to be more consistent.