Fix compilation bugs I introduced while rebasing
Fix compilation bugs I introduced while rebasing

roambotics/swift,sschiau/swift,shajrawi/swift,glessard/swift,austinzheng/swift,tkremenek/swift,danielmartin/swift,tkremenek/swift,jmgc/swift,apple/swift,zisko/swift,zisko/swift,devincoughlin/swift,zisko/swift,tjw/swift,frootloops/swift,practicalswift/swift,CodaFi/swift,roambotics/swift,swiftix/swift,natecook1000/swift,brentdax/swift,brentdax/swift,huonw/swift,karwa/swift,allevato/swift,alblue/swift,nathawes/swift,lorentey/swift,jckarter/swift,atrick/swift,huonw/swift,huonw/swift,xedin/swift,frootloops/swift,CodaFi/swift,jopamer/swift,benlangmuir/swift,karwa/swift,airspeedswift/swift,allevato/swift,austinzheng/swift,stephentyrone/swift,jmgc/swift,lorentey/swift,jmgc/swift,shahmishal/swift,danielmartin/swift,jopamer/swift,practicalswift/swift,aschwaighofer/swift,CodaFi/swift,xwu/swift,rudkx/swift,huonw/swift,allevato/swift,rudkx/swift,gregomni/swift,parkera/swift,shahmishal/swift,jmgc/swift,tkremenek/swift,shahmishal/swift,sschiau/swift,amraboelela/swift,shajrawi/swift,tjw/swift,devincoughlin/swift,huonw/swift,benlangmuir/swift,nathawes/swift,jckarter/swift,jmgc/swift,swiftix/swift,stephentyrone/swift,shahmishal/swift,alblue/swift,airspeedswift/swift,amraboelela/swift,nathawes/swift,gregomni/swift,hooman/swift,allevato/swift,glessard/swift,stephentyrone/swift,jckarter/swift,JGiola/swift,amraboelela/swift,ahoppen/swift,atrick/swift,aschwaighofer/swift,xedin/swift,austinzheng/swift,stephentyrone/swift,apple/swift,airspeedswift/swift,danielmartin/swift,devincoughlin/swift,sschiau/swift,glessard/swift,lorentey/swift,danielmartin/swift,swiftix/swift,rudkx/swift,JGiola/swift,glessard/swift,gribozavr/swift,atrick/swift,CodaFi/swift,benlangmuir/swift,xwu/swift,shajrawi/swift,roambotics/swift,tkremenek/swift,harlanhaskins/swift,atrick/swift,hooman/swift,austinzheng/swift,harlanhaskins/swift,jckarter/swift,danielmartin/swift,jckarter/swift,aschwaighofer/swift,austinzheng/swift,shajrawi/swift,gribozavr/swift,xwu/swift,huonw/swift,frootloops/swift,gregomni/swift,brentdax/swift,nathawes/swift,airspeedswift/swift,glessard/swift,rudkx/swift,swiftix/swift,swiftix/swift,hooman/swift,OscarSwanros/swift,natecook1000/swift,jopamer/swift,tjw/swift,karwa/swift,brentdax/swift,hooman/swift,OscarSwanros/swift,CodaFi/swift,frootloops/swift,parkera/swift,jmgc/swift,CodaFi/swift,shajrawi/swift,jopamer/swift,harlanhaskins/swift,aschwaighofer/swift,jopamer/swift,sschiau/swift,xedin/swift,devincoughlin/swift,natecook1000/swift,shajrawi/swift,ahoppen/swift,gribozavr/swift,glessard/swift,apple/swift,xwu/swift,parkera/swift,practicalswift/swift,rudkx/swift,tkremenek/swift,shahmishal/swift,roambotics/swift,hooman/swift,sschiau/swift,hooman/swift,swiftix/swift,tkremenek/swift,danielmartin/swift,stephentyrone/swift,atrick/swift,frootloops/swift,tjw/swift,jckarter/swift,apple/swift,alblue/swift,jopamer/swift,benlangmuir/swift,practicalswift/swift,devincoughlin/swift,shajrawi/swift,harlanhaskins/swift,swiftix/swift,JGiola/swift,apple/swift,zisko/swift,shahmishal/swift,gregomni/swift,OscarSwanros/swift,gregomni/swift,airspeedswift/swift,JGiola/swift,karwa/swift,hooman/swift,benlangmuir/swift,xedin/swift,stephentyrone/swift,gribozavr/swift,frootloops/swift,xedin/swift,alblue/swift,harlanhaskins/swift,OscarSwanros/swift,tkremenek/swift,ahoppen/swift,alblue/swift,lorentey/swift,jopamer/swift,brentdax/swift,aschwaighofer/swift,devincoughlin/swift,gribozavr/swift,ahoppen/swift,parkera/swift,rudkx/swift,karwa/swift,nathawes/swift,natecook1000/swift,zisko/swift,shajrawi/swift,aschwaighofer/swift,practicalswift/swift,nathawes/swift,parkera/swift,zisko/swift,amraboelela/swift,allevato/swift,xedin/swift,karwa/swift,huonw/swift,zisko/swift,lorentey/swift,jckarter/swift,parkera/swift,OscarSwanros/swift,tjw/swift,tjw/swift,amraboelela/swift,gribozavr/swift,parkera/swift,aschwaighofer/swift,amraboelela/swift,brentdax/swift,ahoppen/swift,alblue/swift,OscarSwanros/swift,devincoughlin/swift,devincoughlin/swift,xwu/swift,alblue/swift,xwu/swift,benlangmuir/swift,OscarSwanros/swift,gribozavr/swift,parkera/swift,xwu/swift,JGiola/swift,xedin/swift,sschiau/swift,roambotics/swift,practicalswift/swift,airspeedswift/swift,roambotics/swift,jmgc/swift,tjw/swift,harlanhaskins/swift,CodaFi/swift,shahmishal/swift,lorentey/swift,austinzheng/swift,xedin/swift,JGiola/swift,danielmartin/swift,shahmishal/swift,austinzheng/swift,brentdax/swift,lorentey/swift,atrick/swift,airspeedswift/swift,natecook1000/swift,stephentyrone/swift,gregomni/swift,frootloops/swift,lorentey/swift,karwa/swift,practicalswift/swift,allevato/swift,sschiau/swift,karwa/swift,natecook1000/swift,gribozavr/swift,ahoppen/swift,allevato/swift,practicalswift/swift,nathawes/swift,harlanhaskins/swift,amraboelela/swift,natecook1000/swift,apple/swift,sschiau/swift