Small changes to support functional tests