Few server changes, might help with deadlocks