Final commit: Much more crash resistant build.