Updated with some more build helpers.