Fixing runtime dependencies again