More Server fiddling.

Make Raw optional, mark some fields as @Nonnull.