Fix adapters
Stuff