Adjustments in disconnect of server
Normalized constants