Fix certain failing functional tests.