merged in solid fixes for server stability problems