[Suggestion] Building Survivability

This suggestion has been merged into another suggestion:

Beta bugs that have since been fixed - Thanks for all the feedback!