Fixing dependencies to reflect being needed at runtime