Tons of build error fixes