Fix all teh brokennesssssss

It fixes ALL teh brokennesss in teh buildz