ActiveModelAdapter compatibilities

Cleaning up #1361