fix more visibilty issues
Merge branch 'gsoc_hgv' into gh-pages