Fixes for Hover