fixes from 2.2