Fixing various details found while deploying server part.