a few more fixes for the data port