Small changes to some stuff, ServerOnlyClient