Fixes for functional tests