Some more script fixups.