Rollup of fixes and additions for "Add Entry" activity.