Fixes for some functional tests