feature/447: default widget fixes.

Fixing errors from previous commit.