Fixing server ids