Prepare for D9 port