Minor tweaks from some PHP-CLI script needs