Server: added more legacy function checks