Pinning down dependencies a bit more