- fixed build Errors and search/replace errors introduced by the switch to GLM