Minor build tweaks.
Merge pull request #1 from mavnn/master

Minor build tweaks.