Adjust examples a bit to use in batch running