Minor tweaks to Adapter code.