Fixing server issues