Two more fixes for functional tests