Fix a dependency and small fixes