Some more hover refinement