Cleaned up and added some missing deps.