Incorporate fixes from toolserver.org:~platonides/public_html/ggu/index.php