Bug fixes from gh-pages

Info on gh-pages commit