Fix Remote Server compbatibility