Various Build patches