Additional tweaks needed for Twitter model update [#1014]