BUILD FIXES ROUND 3

Still getting SYSUI FC's but getting closer I think