Small changes, mostly for testing.