Fixes for D-01033