Few minor fixes.
* Fixed count window.
* Other small things.