Fixing Build Issues Pt 2