Bug fixes so that code works on server.