Fixing broken build. Fixtures are still an issue.