Improve hover handling.