Fix bugs in moromi csys build