Add some more build automation