Bringing in fixes from gh-pages commit

Info in gh-pages commit