Various fixes

- Fixes #4447

- Fixes mech fabs not correctly upgrading build time: http://baystation12.net/forums/viewtopic.php?f=18&t=9762

Details in commits.