Merge pull request #836 from madewokherd/buildfixes