server fixes
merged