HOVER: Fix a couple of things: