Additional porting changes from local to server.