server: fixes