Fixed accidental dependencies