server: some more skeet changes