Merge pull request #196 from NiLuJe/master

Misc minor build tweaks.