Much fixes for the util script