Minor stuff

Most of the changes required to get the HTML build working. The GLCommon one is probably a good idea anyway.