Datapath fixes, first preparation testapp.