Fix up missing dependencies that were causing exceptions