Fixed a couple of bugs with bad data contracts