some fixes from 1.8 ddk