Further compatibility between production and server.