fixes for D3057, D3152, D3153