Synced up RISC-V build