Some demo issues patches

Based on [this issue](https://github.com/nbubna/HTML/issues/4).