Various misc fixes to enable building on Mac OS again#9

wk8 wants to merge 8 commits intoinfinit:masterinfinit/elle:masterfrom

wk8:wk8/mac_os_buildwk8/elle:wk8/mac_os_buildCopy head branch name to clipboard