Fixing and upgrading Server