Fixes for multi-server pirpose