Fixing some bugs/issues found during GH-Pages dev