Logging fixes
Working with Master server