Merge in more fixes.

Starting to prepare the app for a new release.