Fixes resulting from building using Analyze (cmd-shift-B).