Adapter tweaks