D10 compatibility follow-up