Fix Issue With Null Defaults for Widget Settings

Also fixed a couple of data issues that were a side effect of that.