Move adapters to API
Quench compile warnings