Minor script fixes, scattered.