Fix accounting for visibility.
Fix setting cell height.