Other changes for running on my server.