Fix build.sh mode
Fix missing return statements