more fixes to embedded server