Improvements for real-app usage.