Fixing some issues with ['SERVER_NAME']