Added a couple more build options