Minor updates from local testing.