Misc cleanup on server