Workaround make install issue; add more software