`builder.sh` bug fixes.

Hi,

Found a couple of bugs in my last round of testing.

Regards, Martin.