r3077 - adjusted port types a bit more