Fixed two problems with stlport, caused build errors with glm