Fix a few functional tests issues against server 2.4.