Added upgrade and building validation to make sure that we aren't adding bad values anywhere, ever.