Minor build alignment modifications
Merge branch 'master' of https://github.com/tfwio/gen.snd