Fixes for util.php usage