Fixes to previous commit (adaptors went missing)