fixes from 1.2fixed branch