Fix up scripts to handle custom problems.