Fixing Build Issues Pt 3