server: another scope of fixes