Small modifications to scripts