Fix module building with no moduleId
Add weapons building