Fix a bunch of missing dependency errors