Added/fixed more build scripts