Bugfix: Building overwrite

I recently noticed buildings were overwriting each other, so some buildings would spawn as one type and then become another one later. I updated a few of the scripts, so it shouldn't happen anymore.