Fixes problems with build#781

Shin-nn wants to merge 1 commit into

jniebuhr:masterjniebuhr/gaggimate:masterfrom

Shin-nn:build_fixesShin-nn/gaggimate:build_fixesCopy head branch name to clipboard