Kana's temporary solutions for Issue #10 build failure