Minor changes and related.