Various nice to have changes.