Server - minor improve to utilities file