Actually Fixing Build Issues