Fixes to adaptation routines
Mirror interface in master