Fixed exports for client and server.