Initial D7 port changes