Added fixes for new servers