Wide model fixes and spec fixes.