applying fixes from 1.1