Small server tidy up.