Improved highlight prevention.