Various small cleanup in serving