Fixed some bugs in unit-build methods...