Fixes for hover

From @Cristiano Matos