Minor Framework adjustments.