Fix bugs in build
Stable