Build changes part deux

@quarnster 
Just need you to try this on OSX... I need some sleep now... :D