Fixed a couple more odd dependency bugs.